Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update droplight effects #5563

Merged
merged 16 commits into from Nov 21, 2020
Merged

Update droplight effects #5563

merged 16 commits into from Nov 21, 2020

Conversation

Balferian
Copy link
Contributor

  • Addressed Issue(s): update items Flags: DropEffect #5547
  • Server Mode: Pre/Re
  • Description of Pull Request:
    White pillar effect was removed from 2020-03-04+ clients when was added new effects.
    Added new drop light color (red),
    In new clients (2020-03-04+) Orange pillar was changed to Green color.

Daegaladh
Daegaladh requested changes Nov 19, 2020
View reviewed changes
src/map/itemdb.hpp Outdated Show resolved Hide resolved
@Balferian @Daegaladh
Update src/map/itemdb.hpp
141abf1 
Co-authored-by: Daegaladh <Daegaladh@users.noreply.github.com>
@aleos89
Copy link
Contributor

aleos89 commented Nov 19, 2020

The constant export needs a PACKETVER check around the white pillar as well.

Lemongrass3110
Lemongrass3110 requested changes Nov 21, 2020
View reviewed changes
Copy link
Member

@Lemongrass3110 Lemongrass3110 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

csv2yaml should be reverted as the "new" colors were not supported by the .txt database.

Also tried to clean up the defines and script engine exports of the effect definitions.

src/map/itemdb.hpp Outdated Show resolved Hide resolved
src/map/itemdb.hpp Outdated Show resolved Hide resolved
src/map/itemdb.hpp Outdated Show resolved Hide resolved
src/map/script_constants.hpp Outdated Show resolved Hide resolved
src/map/script_constants.hpp Outdated Show resolved Hide resolved
src/map/script_constants.hpp Outdated Show resolved Hide resolved
src/map/script_constants.hpp Outdated Show resolved Hide resolved
src/tool/csv2yaml.cpp Outdated Show resolved Hide resolved
src/tool/csv2yaml.cpp Outdated Show resolved Hide resolved
src/tool/csv2yaml.cpp Outdated Show resolved Hide resolved
Balferian and others added 12 commits November 21, 2020 08:57
@Balferian @Lemongrass3110
Update src/map/itemdb.hpp
d941f15 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/itemdb.hpp
4e84b12 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/itemdb.hpp
30c99f1 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/script_constants.hpp
24c8cd6 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/script_constants.hpp
a079e21 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/script_constants.hpp
8587454 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/script_constants.hpp
d4ce8b4 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/map/script_constants.hpp
851bd2e 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/tool/csv2yaml.cpp
0d4bcde 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/tool/csv2yaml.cpp
d5a37b5 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian @Lemongrass3110
Update src/tool/csv2yaml.cpp
4578210 
Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
@Balferian
minor fix
2c1c5b7
@Lemongrass3110 Lemongrass3110 linked an issue Nov 21, 2020 that may be closed by this pull request
update items Flags: DropEffect #5547
Closed
@Lemongrass3110 Lemongrass3110 added component:core A fault that lies within the main framework of rAthena mode:renewal A fault that exists within the renewal mode type:bug Issue that is a bug within rAthena labels Nov 21, 2020
@Lemongrass3110 Lemongrass3110 merged commit 071990e into rathena:master Nov 21, 2020
@aleos89 aleos89 mentioned this pull request Feb 17, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aleos89 aleos89 aleos89 left review comments

@Lemongrass3110 Lemongrass3110 Lemongrass3110 approved these changes

@Daegaladh Daegaladh Daegaladh approved these changes

Assignees
No one assigned
Labels
component:core A fault that lies within the main framework of rAthena mode:renewal A fault that exists within the renewal mode type:bug Issue that is a bug within rAthena
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

update items Flags: DropEffect
4 participants
@Balferian @aleos89 @Lemongrass3110 @Daegaladh